Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Deduce primary branch name in merge script #3884

Merged
merged 1 commit into from
Aug 18, 2023
Merged

Deduce primary branch name in merge script #3884

merged 1 commit into from
Aug 18, 2023

Conversation

HebaruSan
Copy link
Member

Motivation

The commit script currently assumes a master branch, but the latest recommendation is to prefer main, as with the KSP2 repos.

Changes

  • Now the name of the primary branch is retrieved from the repo's refs, similarly to Refactor Git Repos NetKAN-Infra#288, which removes one obstacle to renaming CKAN's master
  • I accumulated various trivial C# style changes that didn't belong in other pull requests, which are now dumped here

@HebaruSan HebaruSan added the Infrastructure Issues affecting everything around CKAN (the GitHub repos, build process, CI, ...) label Aug 17, 2023
@HebaruSan HebaruSan changed the title Deduce primary branch name in commit script Deduce primary branch name in merge script Aug 17, 2023
@HebaruSan HebaruSan force-pushed the feature/deduce-primary-branch-name branch from 433d9c8 to ba417a7 Compare August 17, 2023 22:47
techman83
techman83 approved these changes Aug 18, 2023
View reviewed changes
Copy link
Member

@techman83 techman83 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @HebaruSan !

@HebaruSan HebaruSan merged commit 42875fb into KSP-CKAN:master Aug 18, 2023
10 checks passed
@HebaruSan HebaruSan deleted the feature/deduce-primary-branch-name branch August 18, 2023 02:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@techman83 techman83 techman83 approved these changes

Assignees
No one assigned
Labels
Infrastructure Issues affecting everything around CKAN (the GitHub repos, build process, CI, ...)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@HebaruSan @techman83